Merge with xen-ia64-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 13 Apr 2007 10:11:41 +0000 (11:11 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 13 Apr 2007 10:11:41 +0000 (11:11 +0100)

Trivial merge